Remake

first commit, buggy