First Update

Minor Update, major update incoming, maybe rewrite everything