finished up code besides styles

finished up code besides styles