Frontend start

Just a few things conflicted