Need to handle start & end times
Getting better and better